Implement WAFPolicy controller #3532
Open
+2,024
−27
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
enhancement
This was
linked to
issues
Jun 21, 2025
ciarams87
force-pushed
the
feat/wafpolicy-ctlr
branch
2 times, most recently
from
e3a3e51 to
89122cd
Compare
6 tasks
ciarams87
force-pushed
the
feat/wafpolicy-ctlr
branch
from
89122cd to
469bfd8
Compare
tataruty
reviewed
Jun 24, 2025
internal/controller/nginx/config/policies/wafsettings/generator.go
Outdated
Show resolved
Hide resolved
ciarams87
force-pushed
the
feat/wafpolicy-ctlr
branch
from
469bfd8 to
77a793f
Compare
ciarams87
force-pushed
the
feat/wafpolicy-ctlr
branch
from
ddeaa8e to
499cfed
Compare
tataruty
reviewed
Jun 25, 2025
ciarams87
force-pushed
the
feat/wafpolicy-ctlr
branch
from
499cfed to
752013c
Compare
github-actions
bot
added
the
documentation
ciarams87
force-pushed
the
feat/wafpolicy-ctlr
branch
3 times, most recently
from
ad59974 to
047418f
Compare
github-actions
bot
removed
the
documentation
ciarams87
force-pushed
the
feat/wafpolicy-ctlr
branch
from
047418f to
28bcbe2
Compare
sjberman
reviewed
Jul 4, 2025
| if wp.Spec.PolicySource != nil && wp.Spec.PolicySource.FileLocation != "" { | ||
| fileLocation := wp.Spec.PolicySource.FileLocation | ||
| bundleName := helpers.ToSafeFileName(fileLocation) | ||
| bundlePath := fmt.Sprintf("%s/%s.tgz", "/etc/app_protect/bundles", bundleName) |
There was a problem hiding this comment.
First arg is a string literal, doesn't seem like we need to format it.
|
|
||
| if secLog.LogProfileBundle != nil && secLog.LogProfileBundle.FileLocation != "" { | ||
| bundleName := helpers.ToSafeFileName(secLog.LogProfileBundle.FileLocation) | ||
| bundlePath := fmt.Sprintf("%s/%s.tgz", "/etc/app_protect/bundles", bundleName) |
| }, | ||
| expStrings: []string{ | ||
| "app_protect_enable on;", | ||
| "app_protect_policy_file \"/etc/app_protect/bundles/", |
There was a problem hiding this comment.
Shouldn't the file name be a part of this?
Comment on lines
+70
to
+74
| func (v Validator) Conflicts(polA, polB policies.Policy) bool { | ||
| _ = helpers.MustCastObject[*ngfAPI.WAFPolicy](polA) | ||
| _ = helpers.MustCastObject[*ngfAPI.WAFPolicy](polB) | ||
| return false | ||
| } |
There was a problem hiding this comment.
Suggested change
| func (v Validator) Conflicts(polA, polB policies.Policy) bool { | |
| _ = helpers.MustCastObject[*ngfAPI.WAFPolicy](polA) | |
| _ = helpers.MustCastObject[*ngfAPI.WAFPolicy](polB) | |
| return false | |
| } | |
| func (v Validator) Conflicts(_, _ policies.Policy) bool { | |
| return false | |
| } |
Comment on lines
+496
to
+502
| if policyKey.GVK != wafPolicyGVK { | ||
| continue | ||
| } | ||
|
|
||
| if !policy.Valid { | ||
| continue | ||
| } |
There was a problem hiding this comment.
nit: could combine these two
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
Problem:
As a user of NGF
I want my WafPolicy configuration applied to NGINX for the Gateway or Route scope
So that I can enable WAF protection on my traffic
Solution: Implement the WAFPolicy controller.
Testing: Over 90% unit test coverage, and manual testing in a GKE cluster
Closes: #3454
Checklist
Before creating a PR, run through this checklist and mark each as complete.
Release notes
If this PR introduces a change that affects users and needs to be mentioned in the release notes,
please add a brief note that summarizes the change.